Autogenerated HTML docs for v1.7.8-163-g9859a
diff --git a/RelNotes/1.7.9.txt b/RelNotes/1.7.9.txt index 7f05936..258ab7a 100644 --- a/RelNotes/1.7.9.txt +++ b/RelNotes/1.7.9.txt
@@ -16,7 +16,33 @@ * The set of built-in function-header patterns for various languages knows MATLAB. -May also contain documentation updates and code clean-ups. + * "git pull" can be used to fetch and merge an annotated/signed tag, + instead of the tip of a topic branch. The GPG signature from the + signed tag is recorded in the resulting merge commit for later + auditing. + + * "git branch --edit-description" can be used to add descriptive text + to explain what a topic branch is about. + + * "git fmt-merge-msg" learned to take the branch description into + account when preparing a merge summary that "git merge" records + when merging a local branch. + + * "git request-pull" has been updated to convey more information + useful for integrators to decide if a topic is worth merging and + what is pulled is indeed what the requestor asked to pull, + including: + + - the tip of the branch being requested to be merged; + - the branch description describing what the topic is about; + - the contents of the annotated tag, when requesting to pull a tag. + + * "git pull" learned to notice 'pull.rebase' configuration variable, + which serves as a global fallback for setting 'branch.<name>.rebase' + configuration variable per branch. + + +Also contains minor documentation updates and code clean-ups. Fixes since v1.7.8 @@ -25,3 +51,12 @@ * In some codepaths (notably, checkout and merge), the ignore patterns recorded in $GIT_DIR/info/exclude were not honored. They now are. (merge fc001b5 nd/maint-ignore-exclude later to maint). + + +-- +exec >/var/tmp/1 +O=v1.7.8-162-gd2c7807 +echo O=$(git describe master) +git log --first-parent --oneline --reverse ^$O master +echo +git shortlog --no-merges ^$O ^maint master
diff --git a/config.txt b/config.txt index 5a841da..8a7d2d4 100644 --- a/config.txt +++ b/config.txt
@@ -677,10 +677,12 @@ branch.<name>.rebase:: When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when - "git pull" is run. - *NOTE*: this is a possibly dangerous operation; do *not* use - it unless you understand the implications (see linkgit:git-rebase[1] - for details). + "git pull" is run. See "pull.rebase" for doing this in a non + branch-specific manner. ++ +*NOTE*: this is a possibly dangerous operation; do *not* use +it unless you understand the implications (see linkgit:git-rebase[1] +for details). browser.<tool>.cmd:: Specify the command to invoke the specified browser. The @@ -1590,6 +1592,16 @@ Note that an alias with the same name as a built-in format will be silently ignored. +pull.rebase:: + When true, rebase branches on top of the fetched branch, instead + of merging the default branch from the default remote when "git + pull" is run. See "branch.<name>.rebase" for setting this on a + per-branch basis. ++ +*NOTE*: this is a possibly dangerous operation; do *not* use +it unless you understand the implications (see linkgit:git-rebase[1] +for details). + pull.octopus:: The default merge strategy to use when pulling multiple branches at once.
diff --git a/git-branch.html b/git-branch.html index 39de4e8..f9283f8 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -588,7 +588,8 @@ [(--merged | --no-merged | --contains) [<commit>]] [<pattern>…] <em>git branch</em> [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] <em>git branch</em> (-m | -M) [<oldbranch>] <newbranch> -<em>git branch</em> (-d | -D) [-r] <branchname>…</div> +<em>git branch</em> (-d | -D) [-r] <branchname>… +<em>git branch</em> --edit-description [<branchname>]</div> <div class="verseblock-attribution"> </div></div> </div> @@ -828,6 +829,15 @@ </p> </dd> <dt class="hdlist1"> +--edit-description +</dt> +<dd> +<p> + Open an editor and edit the text to explain what the branch is + for, to be used by various other commands (e.g. <tt>request-pull</tt>). +</p> +</dd> +<dt class="hdlist1"> --contains <commit> </dt> <dd> @@ -990,7 +1000,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PDT +Last updated 2011-12-09 15:40:58 PDT </div> </div> </body>
diff --git a/git-branch.txt b/git-branch.txt index f46013c..0427e80 100644 --- a/git-branch.txt +++ b/git-branch.txt
@@ -14,6 +14,7 @@ 'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] 'git branch' (-m | -M) [<oldbranch>] <newbranch> 'git branch' (-d | -D) [-r] <branchname>... +'git branch' --edit-description [<branchname>] DESCRIPTION ----------- @@ -158,6 +159,10 @@ like '--track' would when creating the branch, except that where branch points to is not changed. +--edit-description:: + Open an editor and edit the text to explain what the branch is + for, to be used by various other commands (e.g. `request-pull`). + --contains <commit>:: Only list branches which contain the specified commit.
diff --git a/git-commit-tree.html b/git-commit-tree.html index d4e4306..3c4ab2c 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html
@@ -583,7 +583,8 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="verseblock-content"><em>git commit-tree</em> <tree> [(-p <parent commit>)…] < changelog</div> +<div class="verseblock-content"><em>git commit-tree</em> <tree> [(-p <parent>)…] < changelog +<em>git commit-tree</em> [(-p <parent>)…] [(-m <message>)…] [(-F <file>)…] <tree></div> <div class="verseblock-attribution"> </div></div> </div> @@ -592,7 +593,8 @@ <div class="paragraph"><p>This is usually not what an end user wants to run directly. See <a href="git-commit.html">git-commit(1)</a> instead.</p></div> <div class="paragraph"><p>Creates a new commit object based on the provided tree object and -emits the new commit object id on stdout.</p></div> +emits the new commit object id on stdout. The log message is read +from the standard input, unless <tt>-m</tt> or <tt>-F</tt> options are given.</p></div> <div class="paragraph"><p>A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) @@ -618,13 +620,31 @@ </p> </dd> <dt class="hdlist1"> --p <parent commit> +-p <parent> </dt> <dd> <p> Each <em>-p</em> indicates the id of a parent commit object. </p> </dd> +<dt class="hdlist1"> +-m <message> +</dt> +<dd> +<p> + A paragraph in the commig log message. This can be given more than + once and each <message> becomes its own paragraph. +</p> +</dd> +<dt class="hdlist1"> +-F <file> +</dt> +<dd> +<p> + Read the commit log message from the given file. Use <tt>-</tt> to read + from the standard input. +</p> +</dd> </dl></div> </div> <h2 id="_commit_information">Commit Information</h2> @@ -836,7 +856,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PDT +Last updated 2011-12-09 15:40:58 PDT </div> </div> </body>
diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 02133d5..cfb9906 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt
@@ -9,7 +9,8 @@ SYNOPSIS -------- [verse] -'git commit-tree' <tree> [(-p <parent commit>)...] < changelog +'git commit-tree' <tree> [(-p <parent>)...] < changelog +'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree> DESCRIPTION ----------- @@ -17,7 +18,8 @@ linkgit:git-commit[1] instead. Creates a new commit object based on the provided tree object and -emits the new commit object id on stdout. +emits the new commit object id on stdout. The log message is read +from the standard input, unless `-m` or `-F` options are given. A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes @@ -39,9 +41,17 @@ <tree>:: An existing tree object --p <parent commit>:: +-p <parent>:: Each '-p' indicates the id of a parent commit object. +-m <message>:: + A paragraph in the commig log message. This can be given more than + once and each <message> becomes its own paragraph. + +-F <file>:: + Read the commit log message from the given file. Use `-` to read + from the standard input. + Commit Information ------------------
diff --git a/git-config.html b/git-config.html index 8ace464..724d8bc 100644 --- a/git-config.html +++ b/git-config.html
@@ -2008,11 +2008,12 @@ <p> When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when - "git pull" is run. - <strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use - it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> - for details). + "git pull" is run. See "pull.rebase" for doing this in a non + branch-specific manner. </p> +<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use +it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> +for details).</p></div> </dd> <dt class="hdlist1"> browser.<tool>.cmd @@ -4083,6 +4084,20 @@ </p> </dd> <dt class="hdlist1"> +pull.rebase +</dt> +<dd> +<p> + When true, rebase branches on top of the fetched branch, instead + of merging the default branch from the default remote when "git + pull" is run. See "branch.<name>.rebase" for setting this on a + per-branch basis. +</p> +<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use +it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> +for details).</p></div> +</dd> +<dt class="hdlist1"> pull.octopus </dt> <dd>
diff --git a/git-pull.html b/git-pull.html index a4cc0dd..9a634ab 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -873,7 +873,7 @@ fetched, the rebase uses that information to avoid rebasing non-local changes. </p> -<div class="paragraph"><p>See <tt>branch.<name>.rebase</tt> and <tt>branch.autosetuprebase</tt> in +<div class="paragraph"><p>See <tt>pull.rebase</tt>, <tt>branch.<name>.rebase</tt> and <tt>branch.autosetuprebase</tt> in <a href="git-config.html">git-config(1)</a> if you want to make <tt>git pull</tt> always use <tt>--rebase</tt> instead of merging.</p></div> <div class="admonitionblock"> @@ -1625,7 +1625,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PDT +Last updated 2011-12-09 15:40:58 PDT </div> </div> </body>
diff --git a/git-pull.txt b/git-pull.txt index e1da468..0f18ec8 100644 --- a/git-pull.txt +++ b/git-pull.txt
@@ -108,7 +108,7 @@ fetched, the rebase uses that information to avoid rebasing non-local changes. + -See `branch.<name>.rebase` and `branch.autosetuprebase` in +See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in linkgit:git-config[1] if you want to make `git pull` always use `{litdd}rebase` instead of merging. + diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 92d27a6..be8253a 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html
@@ -632,12 +632,9 @@ <tt>refs/heads/master</tt>. When we wanted to switch to another branch, we did <tt>ln -sf refs/heads/newbranch .git/HEAD</tt>, and when we wanted to find out which branch we are on, we did <tt>readlink .git/HEAD</tt>. -This was fine, and internally that is what still happens by -default, but on platforms that do not have working symlinks, -or that do not have the <tt>readlink(1)</tt> command, this was a bit -cumbersome. On some platforms, <tt>ln -sf</tt> does not even work as -advertised (horrors). Therefore symbolic links are now deprecated -and symbolic refs are used by default.</p></div> +But symbolic links are not entirely portable, so they are now +deprecated and symbolic refs (as described above) are used by +default.</p></div> <div class="paragraph"><p><em>git symbolic-ref</em> will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested name is not a symbolic ref, or 128 if another error occurs.</p></div> @@ -650,7 +647,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PDT +Last updated 2011-12-09 15:40:58 PDT </div> </div> </body>
diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index 75b1ae5..a45d4c4 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt
@@ -43,12 +43,9 @@ `refs/heads/master`. When we wanted to switch to another branch, we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which branch we are on, we did `readlink .git/HEAD`. -This was fine, and internally that is what still happens by -default, but on platforms that do not have working symlinks, -or that do not have the `readlink(1)` command, this was a bit -cumbersome. On some platforms, `ln -sf` does not even work as -advertised (horrors). Therefore symbolic links are now deprecated -and symbolic refs are used by default. +But symbolic links are not entirely portable, so they are now +deprecated and symbolic refs (as described above) are used by +default. 'git symbolic-ref' will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested
